Merge changes Ia74dd04d,Ib6a6d3fe

* changes:
  Convert to Android.bp
  Remove mksdcard from the System source tree