Add Android files am: 2942be007a am: 560791a7ac
am: d16f236af7

Change-Id: I0075ad9f8ad197659fe6c1a298b5cf7d23782ef5