Merge "Stop build of unused libraries." am: 9ed309a
am: 8d1af01

* commit '8d1af015e3b3a36146f415afd3101040584433f6':
  Stop build of unused libraries.

Change-Id: I533b8f4172b80195042ce25f43d2cac611aa051f