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