Merge changes I956dd565,I080313dd into pi-dev

* changes:
  Fix race in hidden_api.h
  Fix hidden API flags decoding for intrinsics