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

Change-Id: I4a9defa9eab99aa8bf04c72b82ca1519136a8e10