Merge "Hides FEATURE_CONTEXT_HUB from Android SDK" into rvc-dev am: 6c46c745 am: bdc7da35 am: c8e8d958 Change-Id: Ib1aadbf33fd84cc8fc4a239b464adeaed68457d8