Merge "Add manager controller to Android.bp"