Merge "Restructuring of AAID using aidl_interface build system." into main