Merge "Remove build rules for module-app API" am: e534a33ca3 am: b37648b759 am: 5ffbe6f31c

Change-Id: I499aac005559a80b3254c0d7e7a8b32d5ccc6382