Merge proposals

android-platform-frameworks-native in Ubuntu has no merge proposals.