am 5cfa1ec8: Merge commit \'6f56ebc73762945f2757c66c91ef4702edd979b8\' into donut

Merge commit '5cfa1ec8842feb907efacfd7c139dcfa3e108ad2'

* commit '5cfa1ec8842feb907efacfd7c139dcfa3e108ad2':
  AI 149397: ADT 1807821 and 1841824: Fixes in android tool