* Let's be more Android Studio friendly * While at it match AOSP deps with Gradle ones and update them Change-Id: Ib8829e3d954ce43fbf19280d1db2bc43c6fc89e0