automerge: 06caf1b
* commit '06caf1b1112a6a3e364a46d02b883451e9180a07':
libandroidfw: Do not build device library when building SDK
automerge: 06caf1b
* commit '06caf1b1112a6a3e364a46d02b883451e9180a07':
libandroidfw: Do not build device library when building SDK