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

Change-Id: I415b566626aa3c2a28258dc00fb05e07bd874c87