Merge "Fix space in Android.bp to make aidegen -i c frameworks succeed." into sc-dev