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

* commit '9ed309a54518bcd5c3648cb6e868b98cf4284a70':
  Stop build of unused libraries.

Change-Id: I25025a23711dfabb596113af0cbdcc99d3142072