Fix broken build for git_master/apps
am: b14f749b7a

Change-Id: I8c86cb15591a9afecee34beb4b03d5de19f1c645