Merge "Make sure platform libraries are built, regardless of webview.apk" am: da7fef6
am: b077e80

* commit 'b077e80d041f74af240111f457ebd4dd168da6dd':
  Make sure platform libraries are built, regardless of webview.apk

Change-Id: Ie463aeed9f8f9ef1b12d89d571c8a23d5432b05d