[automerger skipped] Merge "Fix: HideFromMake is not registered to llndk_*...
[automerger skipped] Merge "Fix: HideFromMake is not registered to llndk_* module types" into qt-dev
am: 962462b2 -s ours
am skip reason: change_id I44e3668460448d79382617df61171b0ab5b4d98d with SHA1 5e676fe9 is in history
Change-Id: If25b3b912556df41481d4dc73967a4e0993b322a