Merge "Fixed compilation issues for Android-T bringup"