Merge "Get Android TOP from build.log file." am: 72a662a282
am: 5bc24ca63a

Change-Id: I5712b3d21d8ce5447883b0c70e0352794de8f4a2