Merge "Add 'stubs' to libandroid" am: b0a1d4979e
am: c70dc011f2

Change-Id: I123d7622c5df3459eb9b28f1a720f1798e48a323