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

* commit 'e0967593ee18fb41658d6b187d8cd31044705e3a':
  Stop build of unused libraries.

Change-Id: I5578604aa081b103d98ed342ca616975e81bccc6