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

Change-Id: I43efa9202c777e661ac363ce6699f695245379d4