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

Change-Id: Iddefff693c7ea6c0d91a01fcff119f2d63f15da3