Merge commit 'eabd93028884da74c624d1627037b8ee1dbe134c' of sso://googleplex-android/platform/frameworks/libs/native_bridge_support into HEAD
Change-Id: Ie729077b5c393a269c516f85a9292febbcc20286