Merge "Explicitly depend on privapp config" into qt-dev
am: 9b5a58c20c

Change-Id: I3319f63e8d396084f1a84aa8b07b3a219e03b397