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

* commit '6b80134995e3a477b5069bfe21d35870fb8fe17d':
  Remove out-dated android-20 and android-21 now called android-L