Merge "Remove out-dated android-20 and android-21 now called android-L" into lmp-dev