Merge changes I1825d60e,Ie009a522

* changes:
  Convert prebuilts/misc/common/commons-cli to Android.bp
  Revert "Add a LOCAL_MODULE to use commons-cli"