Merge "Update android-info.txt in dist directory." am: f2aae3b46d am: 3e73ca3207
am: 5ffb92d0e2

Change-Id: Idbf0404b388d9d4edafac00f93ef8a59c045293b