Merge up to 24c4a3d7 from chromium-dev.

Merge up to this commit:
Merge "Add waitForCompletion to requestDrawGL" into chromium-dev

Change-Id: Ib7e4184e99b3156cc938c3c10c252e38fe4eea14
tree: e1ce1383327c55b5f41d2f86bec670710baadcce
  1. Android.mk
  2. chromium/