Merge "Hides FEATURE_CONTEXT_HUB from Android SDK" into rvc-dev am: 6c46c745 am: 7073a280 am: 217a4752 Change-Id: If8963c805bf9b5873c0ca9e215af6eb95cec9ca6