Merge "Hides FEATURE_CONTEXT_HUB from Android SDK" into rvc-dev am: 6c46c745 am: bdc7da35 am: 5c62eab0 am: b4bf7b7d Change-Id: I69d39d3a1fd9cdf9c1b548914e62faf0b1d4cdf6