am 4d8856da: am 6b801349: Merge "Remove out-dated android-20 and android-21 now called android-L" into lmp-dev

* commit '4d8856da3639d6bd967d25fc67ee3821bd471734':