Merge "Update android-info.txt in dist directory."
am: f2aae3b46d

Change-Id: Iaaaf419ddcc8e3ce146daaa25d063009f184f8a5