Merge "Add 'stubs' to libandroid"